From 3cdca46b4d20af26d3cbb2aa05a11e9888351d74 Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Mon, 22 Sep 2014 12:27:36 -0400
Subject: [PATCH] update to HEAD

---
 src/cargo/core/manifest.rs           | 2 +-
 src/cargo/core/package.rs            | 6 +++---
 src/cargo/core/registry.rs           | 8 ++++----
 src/cargo/core/source.rs             | 2 +-
 src/cargo/core/summary.rs            | 2 +-
 src/cargo/ops/cargo_read_manifest.rs | 4 ++--
 src/cargo/sources/path.rs            | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs
index 1b714c5a5..b3e8ab052 100644
--- a/src/cargo/core/manifest.rs
+++ b/src/cargo/core/manifest.rs
@@ -339,7 +339,7 @@ impl Manifest {
         Manifest {
             summary: summary.clone(),
             authors: Vec::new(),
-            targets: Vec::from_slice(targets),
+            targets: targets.to_vec(),
             target_dir: target_dir.clone(),
             doc_dir: doc_dir.clone(),
             sources: sources,
diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
index 0ae1b4be7..fb41ee1a3 100644
--- a/src/cargo/core/package.rs
+++ b/src/cargo/core/package.rs
@@ -48,8 +48,8 @@ impl<E, S: Encoder<E>> Encodable<S, E> for Package {
             dependencies: summary.get_dependencies().iter().map(|d| {
                 SerializedDependency::from_dependency(d)
             }).collect(),
-            authors: Vec::from_slice(manifest.get_authors()),
-            targets: Vec::from_slice(manifest.get_targets()),
+            authors: manifest.get_authors().to_vec(),
+            targets: manifest.get_targets().to_vec(),
             manifest_path: self.manifest_path.display().to_string()
         }.encode(s)
     }
@@ -138,7 +138,7 @@ impl PackageSet {
     pub fn new(packages: &[Package]) -> PackageSet {
         //assert!(packages.len() > 0,
         //        "PackageSet must be created with at least one package")
-        PackageSet { packages: Vec::from_slice(packages) }
+        PackageSet { packages: packages.to_vec() }
     }
 
     pub fn len(&self) -> uint {
diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
index 369ad7bf6..807ca2e3b 100644
--- a/src/cargo/core/registry.rs
+++ b/src/cargo/core/registry.rs
@@ -44,7 +44,7 @@ impl<'a> PackageRegistry<'a> {
             try!(source.download(package_ids));
             let packages = try!(source.get(package_ids));
 
-            ret.push_all_move(packages);
+            ret.extend(packages.into_iter());
         }
 
         // TODO: Return earlier if fail
@@ -135,7 +135,7 @@ impl<'a> Registry for PackageRegistry<'a> {
             try!(self.ensure_loaded(dep.get_source_id()));
             let mut ret = Vec::new();
             for src in self.sources.sources_mut() {
-                ret.push_all_move(try!(src.query(dep)));
+                ret.extend(try!(src.query(dep)).into_iter());
             }
             Ok(ret)
         } else {
@@ -165,7 +165,7 @@ pub mod test {
         }
 
         pub fn summaries(mut self, summaries: Vec<Summary>) -> RegistryBuilder {
-            self.summaries.push_all_move(summaries);
+            self.summaries.extend(summaries.into_iter());
             self
         }
 
@@ -175,7 +175,7 @@ pub mod test {
         }
 
         pub fn overrides(mut self, summaries: Vec<Summary>) -> RegistryBuilder {
-            self.overrides.push_all_move(summaries);
+            self.overrides.extend(summaries.into_iter());
             self
         }
 
diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs
index 145776558..e89eefca8 100644
--- a/src/cargo/core/source.rs
+++ b/src/cargo/core/source.rs
@@ -349,7 +349,7 @@ impl<'a> Registry for SourceSet<'a> {
         let mut ret = Vec::new();
 
         for source in self.sources.iter_mut() {
-            ret.push_all_move(try!(source.query(name)));
+            ret.extend(try!(source.query(name)).into_iter());
         }
 
         Ok(ret)
diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs
index e5bee9d97..c3f1bb1f1 100644
--- a/src/cargo/core/summary.rs
+++ b/src/cargo/core/summary.rs
@@ -16,7 +16,7 @@ impl Summary {
     pub fn new(pkg_id: &PackageId, dependencies: &[Dependency]) -> Summary {
         Summary {
             package_id: pkg_id.clone(),
-            dependencies: Vec::from_slice(dependencies),
+            dependencies: dependencies.to_vec(),
         }
     }
 
diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs
index 7681a6540..19615f60e 100644
--- a/src/cargo/ops/cargo_read_manifest.rs
+++ b/src/cargo/ops/cargo_read_manifest.rs
@@ -96,9 +96,9 @@ fn read_nested_packages(path: &Path, source_id: &SourceId,
     let mut ret = vec![pkg];
 
     for p in nested.iter() {
-        ret.push_all_move(try!(read_nested_packages(&path.join(p),
+        ret.extend(try!(read_nested_packages(&path.join(p),
                                         source_id,
-                                        visited)));
+                                        visited)).into_iter());
     }
 
     Ok(ret)
diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index 797707569..af670de05 100644
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -184,7 +184,7 @@ impl Source for PathSource {
     fn update(&mut self) -> CargoResult<()> {
         if !self.updated {
             let packages = try!(self.read_packages());
-            self.packages.push_all_move(packages);
+            self.packages.extend(packages.into_iter());
             self.updated = true;
         }
 
-- 
2.30.2